From 44f7b0657b75f430708fba2616503492b3052be5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jul 2007 16:29:58 +0000 Subject: [PATCH] Be more careful when calling g_propagate_error(). (#453365, Michael 2007-07-03 Matthias Clasen * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be more careful when calling g_propagate_error(). (#453365, Michael Chudobiak) svn path=/trunk/; revision=18357 --- gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/gdk-pixbuf-loader.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index a2f8a51a9d..66f0d40da8 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2007-07-03 Matthias Clasen + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be + more careful when calling g_propagate_error(). (#453365, + Michael Chudobiak) + 2007-07-02 Matthias Clasen * === Released 2.11.5 === diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index d1721451c4..130608fb3e 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -723,8 +723,8 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, GError *tmp = NULL; if (!priv->image_module->stop_load (priv->context, &tmp) || tmp) { + gdk_pixbuf_loader_ensure_error (loader, &tmp); g_propagate_error (error, tmp); - gdk_pixbuf_loader_ensure_error (loader, error); retval = FALSE; } } -- 2.30.2